When installing libblktap, symlinks should be made instead of using

install on the symlinks (install will follow the symlink)

Signed-off-by: Jeremy Katz <katzj@redhat.com>

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index c0eb28bde1b0f7bc8cf7d8da62fe745f4ce86b18..2d5b98e41acd1ca1519bf671f80cc8a9f72febe9 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -33,7 +33,7 @@ DEPS     = .*.d
 OBJS     = $(patsubst %.c,%.o,$(SRCS))
 IBINS   :=
 
-LIB      = libblktap.a libblktap.so libblktap.so.$(MAJOR) libblktap.so.$(MAJOR).$(MINOR)
+LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
 
 all: build
 
@@ -44,10 +44,12 @@ install: all
        $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_DIR) -p $(DESTDIR)/usr/include
        $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
+       ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
+       ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
        $(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include
 
 clean:
-       rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
+       rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
 
 libblktap: $(OBJS) 
        $(CC) $(CFLAGS) -Wl,-soname -Wl,$(SONAME) -shared         \